From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 20 May 2001 17:17:32 +0000 (+0000)
Subject: (rmail-retry-failure): Do save-window-excursion.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~40199
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f2c0cd83aecad112221ffdd3653d86652581fcd8;p=emacs.git

(rmail-retry-failure): Do save-window-excursion.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d6a8f5868f5..35c7cbefeaa 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3422,9 +3422,12 @@ specifying headers which should not be copied into the new message."
 			  (insert "BCC: " (user-login-name) "\n"))))
 		  (goto-char (point-min))
 		  (mail-position-on-field (if resending "Resent-To" "To") t)))))
-      (with-current-buffer rmail-this-buffer
-	(if pruned
-	    (rmail-toggle-header 1))))))
+      ;; save-window-excursion is needed because of the switch-to-buffer
+      ;; in rmail-toggle-header.
+      (save-window-excursion
+	(with-current-buffer rmail-this-buffer
+	  (if pruned
+	      (rmail-toggle-header 1)))))))
 
 (defun rmail-summary-exists ()
   "Non-nil iff in an RMAIL buffer and an associated summary buffer exists.